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

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

Change-Id: Ie1868052cbe6a622a09d486ac280a25a2e97bf7b