Merge "Remove MODERN_BOUNCER flag." into tm-qpr-dev am: fa016f61 am: a539c66e

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



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