Merge changes from topic "qpr.biometric.2panels" into tm-qpr-dev am: c8f45f75 am: a585bebc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19764093



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