Merge "Fix launch existing split pair fail after unfold device" into...

Merge "Fix launch existing split pair fail after unfold device" into tm-qpr-dev am: 60135eb2 am: b7f38d96

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



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