Merge "Change Notification expander to use 10% opaque foreground color" into...

Merge "Change Notification expander to use 10% opaque foreground color" into udc-qpr-dev am: a21164e9

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



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