Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
am: 257bc2eda1
-s ours am: 94573f96bb
-s ours am: 488ca4b012
-s ours am: 8b8dc79190
-s ours" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
4e438d00f7