Merge changes from topic "presubmit-am-4e0667c00fd14f20821e1bf2df948968" into sc-mainline-prod am: b19deed705

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

Change-Id: Id505579996d6133a953c1246d1a28bc3e020aa8a