Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d" into sc-dev-plus-aosp am: 4d3edb5d

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

Change-Id: I5463f5dbd916b3140ff97e7d1c43d283d14fd463