Merge changes from topic "am-cd5a3cea6b294c4983a26f694f5a5c34" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-dev am: dee47fbf -s ours am: 5a04afe7 -s ours am: b87c5aa1 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 8f3ca8da -s ours am: e10ad67f -s ours am: 87bbc90f -s ours