Merge changes from topic "presubmit-am-1d1cd88cc63d4a20a2e01c6e7836744e" into sc-qpr1-dev am: 30cf1314

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

Change-Id: I087325f056a90dc1915c9adcf803134c006cb22e