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 am: 08253521

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



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