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

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

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