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

[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd669 -s ours am: 7bed9704 -s ours am: da4043c7 -s ours am: ae5cbfac -s ours

am skip reason: subject contains skip directive

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



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