Merge "Defines flag for ravemped WPP UI (1/5)." into tm-qpr-dev am: 77c214e4

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



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