[conflict] Merge changes from topic...

[conflict] Merge changes from topic "presubmit-am-4c8411152aef49f099eee419e063b01e" into sc-v2-dev-plus-aosp am: 087e879b

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

Change-Id: I46336888da6b90649c6def8fbc10c8032f4f2821