Merge changes from topic "presubmit-am-9e19ef3aeac3461da35856b896c7b70d" into sc-qpr1-dev am: 0d65dda435 am: 604fc43e6b

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

Change-Id: I159b1f1706820770c946ad95a1457ce214845a81