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

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

Change-Id: I7d34cbcc676b20919aee198c4c1fe2a782a742e8