Merge changes from topic "presubmit-am-54c71514c6e64d9595298afeee5d4938" into sc-v2-dev-plus-aosp am: 30b3369a

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

Change-Id: I8c8c2a5cfe8fb0b372a1ddc5580bbf587a5ef4f1