Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into sc-qpr1-dev am: 4edfbf360a am: 8ba8fad707

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

Change-Id: I8f2fcb69ac47d430e03f449569990e7259e42d6c