Merge changes from topic "am-26c28ebb54a241eea293a13ad6ca0543" into udc-qpr-dev-plus-aosp
* changes: 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:95a303ce6d
-s ours am:45e6fbbb81
-s ours am:57e52a7da8
-s ours" into udc-d1-dev-plus-aosp am:2df94229d9
-s ours [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:95a303ce6d
-s ours am:45e6fbbb81
-s ours am:57e52a7da8
-s ours am:c37e45ba7e
-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
8bc7f7ea86