Merge "Hide alternateBouncer onTrustChanges, not biometricAuth" into udc-dev am: 423b9e59 am: a4292ce7

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



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