Merge changes from topic "presubmit-am-ad6d5f64563d48c980b3845a26947098" into sc-mainline-prod am: 089e1beca1

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

Change-Id: I80c62e09ea8e4b5aea9d697792604745fed13c51