Merge "Fixing shade not collapsing after rotating from split shade" into...

Merge "Fixing shade not collapsing after rotating from split shade" into udc-dev am: 9ade6c30 am: 66244229 am: b8d3cea2

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



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