Merge "Fix alpha not fading on notifications after the first shade expansion"...

Merge "Fix alpha not fading on notifications after the first shade expansion" into tm-qpr-dev am: 3def199b

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



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