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

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



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