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

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f8 -s ours am: 7475b967 -s ours am: 2ce24a1f -s ours am: 355e2576 -s ours am: 419537da -s ours am: df35caa5 -s ours am: 97da6881 -s ours" into udc-d1-dev-plus-aosp am: 93a87de2 -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/+/24301338



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