[automerger skipped] Merge "Support exit to full screen to non-split app" into...

[automerger skipped] Merge "Support exit to full screen to non-split app" into tm-dev am: af014f9e am: acd07ec1 -s ours

am skip reason: Merged-In Iae61d821028755dcca96edb904912495b268bf8c with SHA-1 f8b022ef is already in history

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



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