Merge changes from topic "presubmit-am-7e1940cadd2a43ad94282dd8aef456b4" into sc-dev-plus-aosp am: 3939db651c

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

Change-Id: Iab1b7554770776dbf71484770d4572df9b5c1acb