Merge "Merge "Retain udfps auth bouncer after orientation change" into sc-qpr1-dev am: 28727376 am: 6273bfdb" into sc-v2-dev-plus-aosp am: b9bb3319

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

Change-Id: I69c5fa41b8c3711e65bb3914d3e40fe0bd63e396