Merge changes from topic "presubmit-am-81b9366173a4480bb41aa6101c78be94" into sc-qpr1-dev am: cec40c4e77 am: 96bbf09302 am: dab2a58f08

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

Change-Id: Ifc9301682f49fe14fda6c1c4d5d0423bd07de14b