Merge changes from topic "presubmit-am-b573694ac00f425591ad626ca6ca14e0" into sc-qpr1-dev am: d076575915 am: bbe40a094d am: 1399d15eea

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

Change-Id: Ia0dc7a9554faae2bbf2f912f1f6182e09e074a18