[automerger skipped] Merge changes from topic "device_lock_listener" into main...

[automerger skipped] Merge changes from topic "device_lock_listener" into main am: c947e10e am: aea3e88a -s ours

am skip reason: Merged-In Iebe4b51e1d5660b952a3ba390fbca07fb5fe962b with SHA-1 49a495b5 is already in history

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



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