[automerger skipped] Merge "Update naming for the AlternateBouncer" into tm-qpr-dev am: 350ccaaee5 -s ours am: 9fd6a4aa9d -s ours
am skip reason: Merged-In Icd2f8fbf76192d9ce8b5ecad3aa4919f9c3a49c0 with SHA-1 991093d15e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20385292
Change-Id: I2bec56e6296ea111f0e972879257248bb409e4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: