[automerger skipped] Merge "Update ICC lock API methods" am: bf2a6d1e am:...

[automerger skipped] Merge "Update ICC lock API methods" am: bf2a6d1e am: 690de7e7 am: a1790708 -s ours

am skip reason: Change-Id Ia4ba222dfa7d7756a3675f75b3467d0265967516 with SHA-1 536cb60c is in history

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

Change-Id: Ia6407ef8769ab5fd902cdf9007309823380859b6