Merge changes from topic "presubmit-am-cb4679fd6eb1414cb720168b20bbb591" into sc-qpr1-dev am: f409849bc4 am: 85da1db1aa am: 8ac8f535bb

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

Change-Id: Ib82837d41b0d80ca317888d2a8bba2efc5e366a9