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

[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f8 -s ours am: 7475b967 -s ours am: 2ce24a1f -s ours am: 355e2576 -s ours am: 419537da -s ours am: df35caa5 -s ours am: 03fce455 -s ours am: e0bb7a6d -s ours

am skip reason: subject contains skip directive

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



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