Fix build error: Needed for cm merges from InCallUI & services/Telephony

Global Settings (MSIM): Add global settings for naming sim cards

Change-Id: Ibbd0d48042a92f82241a4ccaee12a81ca13ccdb4
Merge "Fix build error: Needed for cm merges from InCallUI & services/Telephony" into kk44
Merge remote-tracking branch 'upstream/kk44' into kk44