Merge "Show side fingerprint sensor on bouncer also for small screens" into...

Merge "Show side fingerprint sensor on bouncer also for small screens" into tm-qpr-dev am: ce370c62 am: 5d042793

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



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