[automerger skipped] Merge "[Settings] Remove access to getSimOperator() API"...
[automerger skipped] Merge "[Settings] Remove access to getSimOperator() API" am: cd4113ba am: 5113ada6 am: 74baf759 -s ours
am skip reason: Change-Id I25cc9dc0912564b8d6f8b23b53f3eb20a51eea32 with SHA-1 bb53dd5f is in history
Change-Id: I4f5a0e92cf34f8a3cc27673f133f3730b10ec154