Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into sc-mainline-prod am: 55d979ea66

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

Change-Id: I42b9e55c7f9e5ba68428ad2c844948205e6ea722