Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev am: 00885a8cb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965 Change-Id: Ifd772c48ea27b360826e4e87433edec520c89b58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: