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

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

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