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

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

Change-Id: I0f547a3a63415415ff5100436df64a43b56e819d