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

Merge "[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba1 -s ours am: 733d83d2 -s ours am: aa93927b -s ours am: 80ef1e0f -s ours am: 7f97ac5e -s ours am: 46430154 -s ours am: f050fc11 -s ours am: a78f35b2 -s ours am: 1679e7f6 -s ours am: 090679fd -s ours" into main