Merge changes from topic "presubmit-am-38ca296c39a34a24b9e36e667e4f04a8" into sc-qpr1-dev am: e758de7f64 am: 7f0c31ad06

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

Change-Id: I54553b26cf5c731dab373a1f594be2fd3b0c3a6b