Merge changes from topic "presubmit-am-6bd3c47be92a487ca1fb9007131b59ff" into sc-v2-dev-plus-aosp am: 5c813297

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

Change-Id: Ifd6ee8c39e8d92bb7cd86ca5c3c958ac5a3599c2