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

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

Change-Id: I4eb8697cfe735d8cc2bf97d16c5f4e0e4223cfe3