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: I02eb0b1d5ff3b37f119cc97a99fdb8441e14589c