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

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8 -s ours am: d1a31c86 -s ours am: bf4f533e -s ours am: d890d1b4 -s ours am: 8b995bbc -s ours am: 936bf45f -s ours am: 965d0460 -s ours am: d60572e3 -s ours" into udc-d1-dev-plus-aosp am: 1eb56a1e -s ours am: 5a94df02 -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/+/24301340



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