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

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793 am: 257bc2ed -s ours am: 94573f96 -s ours am: 488ca4b0 -s ours am: 3a7a9be7 -s ours" into udc-d1-dev-plus-aosp am: 2d4ca1db -s ours am: 80daabd0 -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/+/24301337



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