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

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca10 -s ours am: 81bd8912 -s ours am: e176ec56 -s ours am: 7f7cd6c3 -s ours am: c1c1acfd -s ours am: 8e234af0 -s ours" into udc-d1-dev-plus-aosp am: e53cd733 -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/+/24299129



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