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

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



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