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

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

Change-Id: I51e8f873278740ef55f59df59848a48d050030c1