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

[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793 am: 257bc2ed -s ours am: 94573f96 -s ours am: 488ca4b0 -s ours am: 3a7a9be7 -s ours am: b1ea26ca -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337



Change-Id: I8f89eb907bdfa947725ee34748add782d94c2c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>