Merge changes from topic "presubmit-am-db33ed04940a45cdb749d4f32e140047" into sc-mainline-prod am: aae8887fe0

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

Change-Id: I3b617d77f37dc954536f39619b5a1ab43670738b