[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f8 -s ours am: 7475b967 -s ours am: 2ce24a1f -s ours am: 06c25886 -s ours am: f20abd93 -s ours am: 4e139e4e -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: I106776f9f4bfb3ee844f8eb01be454fef45cc905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>