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

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

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