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

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

Change-Id: Ic7fcfc4f59ec430b2d8126dc72239f9c8f232682