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

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



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