Merge "RESTRICT AUTOMERGE Update FP listening state on keyguardGoingAway" into tm-qpr-dev am: 38a805e8db

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

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