Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-mainline-prod am: 6a1c47ab1a

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

Change-Id: I3ad22b0d58179e275a8b61d48d2fe13b777c7712