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

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35 -s ours am: 67c4be1e -s ours am: 57c5a925 -s ours am: 3a9f8d7b -s ours am: 95a303ce -s ours am: 45e6fbbb -s ours am: 57e52a7d -s ours" into udc-d1-dev-plus-aosp am: 2df94229 -s ours am: 8b90c3dc -s ours

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

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



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