Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-dev-plus-aosp am: 08713c8ad5 am: 3d1a04c942

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

Change-Id: I633359e91b496a62e984b4a22d860ecc2d70f3f0