Merge "Make multi-instances split opt-in based" into tm-qpr-dev am: 1e20bf87

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20295364



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