Merge "Fixed an issue where notification launches were visually broken" into...

Merge "Fixed an issue where notification launches were visually broken" into tm-dev am: 11c6bd07 am: 58cfbe18

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



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