Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b2f

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

Change-Id: I2bf6582bd4fdbb647a3795a8e1311995a3e3f2e8