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

[automerger skipped] Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea am: 4a121f06 am: 36bc7f92 -s ours
am skip reason: Change-Id I4bf1341f972639829cd9fc64370018127460a65f with SHA-1 698e2ed9 is in history

Change-Id: Ibef0c7346a78a7723c36db60259976189c0ba52a