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: 7de1458e am: 6e0547ec

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



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