Merge "Split-shade: prevent new shade expansion when shade already expanded"...

Merge "Split-shade: prevent new shade expansion when shade already expanded" into tm-dev am: 9cbaca73 am: 17633036

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



Change-Id: I2e174625424daddb51cf61f9d8147d61da643004
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>