Merge changes from topic "presubmit-am-4e0667c00fd14f20821e1bf2df948968" into sc-dev-plus-aosp am: 70b74a3f1f

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

Change-Id: I45132732c042f21026912d063bca1dada67944dc