Merge "Defines flag for ravemped WPP UI (2/5)." into tm-qpr-dev am: 9f99b0b7 am: 338128c8

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



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