Merge "Update ICC lock API methods" am: bf2a6d1e11 am: 690de7e76e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1506478

Change-Id: Ia8a96a3271de030b6ebe6dc40c734d75887baa0a