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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf -s ours am: 5a04afe7 -s ours am: 260fe833 -s ours am: 1931bcbf -s ours

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

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



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