Merge "Enhance error handling logic to restore split-screen" into tm-qpr-dev...

Merge "Enhance error handling logic to restore split-screen" into tm-qpr-dev am: c583cc01 am: 7e0e00b8

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



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