Merge changes from topic "presubmit-am-af3a9aca4e964a6d8bba7a4113919ae9" into sc-dev-plus-aosp am: a3d8796401 am: 6c46f85a18 am: a7b0d6a829

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

Change-Id: I6ad1f7e87b908b43dd30b670cd0b43c4a64fa9bb