Merge "Fixes tests and issues when toggling new app shortcut popup flag." into...

Merge "Fixes tests and issues when toggling new app shortcut popup flag." into tm-qpr-dev am: d4eed6ec

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



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