[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
am: 011f39e944
-s ours am: f509f69b79
-s ours am: 7946f730fd
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337 Change-Id: Iab6b87a8bcecedf8ce075f436dab0ef7b6cb1cf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: