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

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



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