[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47
-s ours am: 8360c2e940
-s ours am: 38f20c5e08
-s ours am: a2d0bf6d5a
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336 Change-Id: I4a3832759a4a74d27b7e5cb0417ed37b58960bca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: