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: 85422113

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



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