Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into sc-mainline-prod am: 34cc4362

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

Change-Id: I0752f3627edc8c59fb7b4e9d75f34f5008e613d2