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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20752912



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