[automerger skipped] Merge "Add System API to indicate whether physical SIM...
[automerger skipped] Merge "Add System API to indicate whether physical SIM can be disabled." am: 454c0659 am: 0b253186
am: 603d7e7d -s ours
am skip reason: change_id I764f344b0d430cb49ccccc9f402139ea32e70c92 with SHA1 c5dedead is in history
Change-Id: I1fbaf6919700013c7e84ae66996b33be903ae4fc