[automerger skipped] Merge "Defines flag for ravemped WPP UI (1/5)." into...

[automerger skipped] Merge "Defines flag for ravemped WPP UI (1/5)." into tm-qpr-dev am: 77c214e4 am: 91191716 -s ours

am skip reason: Merged-In I7032669d4a954465485a570874f5a964e5e819da with SHA-1 40765fc2 is already in history

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



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