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

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

Change-Id: Ia6241c0300ef9ece9df5bb5f2bddcdddd7343b58