Merge changes from topic "presubmit-am-be485105f9b444559d3c27e9898a99c9" into sc-qpr1-dev am: ccd543980b

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

Change-Id: If57f095b14f62c88507cef011296a78c91c50b65