Merge "Remove unnecessary GridDisplayOption_defaultSplitDisplayLayoutId attribute" into tm-qpr-dev am: 8a7dc2b244 am: 4fb5e62810

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

Change-Id: If50694adfcaaf0b98987e7ac840a82740e3e1b41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>