Merge "[TelephonyMainline] @hide system api since we'll revisit in S. - IccLock" am: 685fe6f443

Change-Id: I09fd77b7597cc8d1551bd71a0d1013506585f93e