Merge changes from topic "presubmit-am-18a7324d3163401db618e725a06a3dba" into...

Merge changes from topic "presubmit-am-18a7324d3163401db618e725a06a3dba" into sc-qpr1-dev am: a33cbebd

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

Change-Id: I435e83246fb3f55c420351ce7d870c84eee8a49e