[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours am: 67c4be1e52
-s ours am: 57c5a92514
-s ours am: 3a9f8d7b32
-s ours am: c598a4cf48
-s ours am: 92939c1eb3
-s ours am: 64f3b181ab
-s ours am: 783e16cb2c
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339 Change-Id: Ib620f06268481d17c91fc66c50bd45a7e3776745 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: