Merge changes from topic "presubmit-am-2f8e16fe33c44e5196ee3ee1963fafb2" into sc-qpr1-dev am: 04162f05

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

Change-Id: Ia18da606589470e86ed75583ba30250f04237750