Merge changes from topic "presubmit-am-323f1efd13694d1c823ff0877ccea911" into sc-dev-plus-aosp am: 9f4a338184 am: 3f4adb73a2

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

Change-Id: I1906d1762b7e8aeca76f58b321cad8cee37fccdd