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

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



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