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

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



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