Merge "Fix NPE when rotation after split dismissed" into tm-dev am: 50faf89e

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



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