Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into...

Merge changes from topic "presubmit-am-c855899eb6884ec09b246be887e3785b" into sc-qpr1-dev am: 4edfbf36 am: 8ba8fad7 am: c7207f17 am: 5e820f3d

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

Change-Id: I5b7e7f93a5a257cc41dcb114bed1c154fb801c54