Merge "Fix FingerprintManager won't display BP on SFPS devices" into...

Merge "Fix FingerprintManager won't display BP on SFPS devices" into tm-qpr-dev am: 10a3ecd7 am: 747d8bdf am: 940f264e am: 9ebd22c5

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



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