Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into...

Merge changes from topic "presubmit-am-a3e3a46016284fa6bec11af293474cfb" into sc-qpr1-dev am: ae4b713b am: 0fb7fa4e am: f9ef6e3b am: 5fdbc89b am: a30f6a11

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

Change-Id: I3ebe6f3448841ea0947529a995a034fe0052a837