Merge "Adding flag for material U popup" into tm-qpr-dev am: 07bcfaa7 am: acc0a729

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



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