Merge changes from topic "presubmit-am-db33ed04940a45cdb749d4f32e140047" into sc-qpr1-dev am: c8eff0cf70 am: 980279e161

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

Change-Id: I690546a3666592396943407f58bf5fe2c9a0c8c4