Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through...
Merge "[Settings] To avoid use APIs in IccCard directly, calling APIs through TelephonyManager" am: 5503c8ea am: 4a121f06
Change-Id: Ie77bbc3fe379e11bb87b5af9ff8fdf424f503008