Merge changes from topic "presubmit-am-81b9366173a4480bb41aa6101c78be94" into sc-qpr1-dev am: cec40c4e77 am: f14e9e3545 am: 0dfacc8ba7

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

Change-Id: Id8d21a218ecc6aedbd6cecafdd941add4a160e14