Merge "[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: 503317bba1
-s ours" into udc-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
01567c311e