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

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

Change-Id: Iab46be7fcec1662fac892e61180b758fe3f0bb48