Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 168c204f49 am: b4f100354e

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

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