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

[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba1 -s ours am: 733d83d2 -s ours am: aa93927b -s ours am: 80ef1e0f -s ours am: 7f97ac5e -s ours am: 46430154 -s ours am: 35e6c7b3 -s ours am: d220b79a -s ours

am skip reason: subject contains skip directive

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



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