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

[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca10 -s ours am: 81bd8912 -s ours am: bf33df4d -s ours am: 92470de9 -s ours am: 27d52103 -s ours am: 34c6eeb0 -s ours

am skip reason: subject contains skip directive

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



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