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

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

Change-Id: Ic705b0fc22ebfb3266d1f5e24ed244472b599282