Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-qpr1-dev am: ccd543980b am: c8c4b55141

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

Change-Id: I57be7fd6af2193a7649166e00b5f0a2e642b8ad1