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

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



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