Merge "Allow Device Lock APEX to use the SettingsLib" into udc-dev am: faf24da9 am: cf663151 am: fe12beb5 am: 0261f62d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23047962



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