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

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



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