Merge "Fix media staying too long during shade "immediate"...

Merge "Fix media staying too long during shade "immediate" expansion/collapsing" into tm-qpr-dev am: c7359149 am: 22561ea6

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



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