Merge "Fix notification expand-collapse crossfade issue" into tm-qpr-dev am:...

Merge "Fix notification expand-collapse crossfade issue" into tm-qpr-dev am: 006055d4 am: 271fe577

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



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