Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from...

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793 am: 011f39e9 -s ours am: f509f69b -s ours am: 4809792e -s ours" into udc-d1-dev-plus-aosp am: 2f507ace -s ours

am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 e0b5a793 is already in history

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



Change-Id: Iad0d74c35499daa0fb9a5388f9b3cc6fa75d672d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>