[automerger skipped] Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" am: 685fe6f443 am: 66d77f04d8 -s ours am: a5dbc67e6d -s ours

am skip reason: Change-Id Iabc3300e883e2afad6145f9bb1410d0606a35c11 with SHA-1 8e622f6f9d is in history

Change-Id: I6553dc934b4c343b7c2537b700fcd1f6a3064972