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

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

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