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

Change-Id: I4ad71e96085f8413368e551de081f5fdb931f6be