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

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

Change-Id: Ib38b2a97a25a224b0f04b2a2a191ca6754b37b3e