Merge changes from topic "presubmit-am-db33ed04940a45cdb749d4f32e140047" into sc-dev-plus-aosp am: 39ef2be6e3

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

Change-Id: I2072d68aa8930dd199d94f37a9f3c81845c9cbf4