[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours am: bf4f533ea6
-s ours am: d890d1b428
-s ours am: 8b995bbc72
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340 Change-Id: I86862bf5248cace08c299b3e7eb4156e06f19632 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: