Merge changes from topic "device_lock_listener" into main am: c947e10efb

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

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