Merge changes from topic "presubmit-am-eb42a70960e740e988dfbddc552edcae" into sc-v2-dev-plus-aosp am: 4f9711c182

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

Change-Id: Iaa54adbb00484f99272212781bdedd84a1d8ecfc