[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895
-s ours am: 7475b96786
-s ours am: 2ce24a1fa9
-s ours am: 06c2588645
-s ours am: f20abd9355
-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: I24bed3ac5ff9576a5c8abbf5b09a4ebb7b9e41e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: