Merge changes from topic "presubmit-am-1d1cd88cc63d4a20a2e01c6e7836744e" into sc-qpr1-dev am: 30cf131415 am: 9c0c74b3b3 am: d6f85c6924

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

Change-Id: I520c384d74893e4a181c6cdfbb19d44800e71dae