Merge "Switch LockSettingsStateListener to java interface" into main am: accaeca9f7

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

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