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

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

Change-Id: I0f5d46ce99b4075ab204e048f1bd2457625dfe7f