Merge changes from topic "presubmit-am-ad6d5f64563d48c980b3845a26947098" into sc-dev-plus-aosp am: 95b8fbebbf am: d57f431619

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

Change-Id: Ic54bfa862439b2486c0f960a559d3dd04b42d93b