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

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

Change-Id: I2670df702d5afda1b3eddcab98f73c54f0114535