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

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



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