[automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly,...

[automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly, moving APIs into TelephonyManager." am: e6d75258 am: 3f044831 am: c8f4ac66 -s ours
am skip reason: Change-Id I1a3c3b15063ea00d0ca59bd5395f2bca8cdfe391 with SHA-1 16a1821f is in history

Change-Id: I4ad71e96085f8413368e551de081f5fdb931f6be