Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev am: b48c123b

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



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