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

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

Change-Id: Ie6eeb4b1059872422d02fdd9ec8481a5b04ab4c0