Merge "Enable MODERN_ALTERNATE_BOUNCER flag" into tm-qpr-dev am: e68624101d am: fdc03d49cf

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

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