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

[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35 -s ours am: 67c4be1e -s ours am: 57c5a925 -s ours am: 3a9f8d7b -s ours am: 95a303ce -s ours am: 45e6fbbb -s ours am: 57e52a7d -s ours am: ae39fa7e -s ours

am skip reason: subject contains skip directive

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



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