Merge changes from topic "presubmit-am-dd3c36e3866a44d6b7f93a76c12cd46d" into sc-dev-plus-aosp am: 4d3edb5d91 am: 9b1030e65c am: 7021004a6f

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

Change-Id: I0e062442696b4ebc4a9654432f3dd5156efd642f