Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into sc-qpr1-dev am: e2c9a05e73

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

Change-Id: I0c2dde360de80056f6c587c373575bfa3bd49a76