[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
am: 011f39e944
-s ours am: f509f69b79
-s ours am: 7946f730fd
-s ours am: 37850ca15b
-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: I6abcf89ba3ff03e9e5a155f2bacdc52c1b5bfcd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: