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

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

Change-Id: I1d2343ce89b720cde51a69b62a5e8e909d61d427