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

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

Change-Id: I1547053969cf0a8fa6b4b32cb16c269f44ea77b4