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

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



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