Merge changes from topic "presubmit-am-ad6d5f64563d48c980b3845a26947098" into sc-qpr1-dev am: b5924a8401 am: dd7ef24f01

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

Change-Id: I68fa310027ec2a1e3d4c5657b37928e7ebbc8000