[automerger skipped] Merge "Never show the alternate bouncer if the primary bouncer is showing" into 24D1-dev am: c52b2c6a2b -s ours

am skip reason: Merged-In I0517dc1ee5417a436c7363c4579bc695dee398a9 with SHA-1 f24eae4e47 is already in history

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

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