Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from...

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35 -s ours am: 67c4be1e -s ours am: 57c5a925 -s ours am: 3a9f8d7b -s ours am: c598a4cf -s ours am: 92939c1e -s ours am: 64f3b181 -s ours am: 503317bb -s ours am: 458d7445 -s ours" into udc-qpr-dev-plus-aosp