Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b am: 0fb7fa4e

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

Change-Id: Ia620f88c81b7b8bac48380c8826ab97b06918ed5