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