Merge "Merge "Remove keyguard unlock listener to fix leak." into tm-dev am: c49da480 am: 7b7fcd3d" into tm-qpr-dev am: a3ef06dc

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



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