Merge changes from topic "presubmit-am-38ca296c39a34a24b9e36e667e4f04a8" into sc-qpr1-dev am: e758de7f

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

Change-Id: If496359426fb85f8f0cb5dab1cb86c4d1b604873