Merge changes from topic "presubmit-am-18a7324d3163401db618e725a06a3dba" into sc-qpr1-dev am: a33cbebd8d am: ebfdc30b46 am: eca59e4565

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

Change-Id: Idc03af08d2c573ef58c38715afbcea0f21e9b96f