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

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

Change-Id: Id1b1ab4d9096828d7300a283b080cc928b2a0e2d