Merge "Merge "Fix notification expand-collapse crossfade issue" into...

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

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



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