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

[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d -s ours am: 8360c2e9 -s ours am: 2f8d8d1d -s ours am: 3759d6c7 -s ours

am skip reason: subject contains skip directive

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



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