Merge changes from topic "presubmit-am-323f1efd13694d1c823ff0877ccea911" into sc-mainline-prod am: d01cffd518

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

Change-Id: Ife4db87dd74eb1a191b511a11cc0da0257cefdb6