Merge "Update FP listening right after POWER_PRESSED err" into tm-qpr-dev am:...

Merge "Update FP listening right after POWER_PRESSED err" into tm-qpr-dev am: 3971c56c am: 6e139f7f

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



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