[automerger skipped] Merge "Fixed an issue where notification launches were...

[automerger skipped] Merge "Fixed an issue where notification launches were visually broken" into tm-dev am: 11c6bd07 am: 58cfbe18 am: 3b8aa89e -s ours

am skip reason: Merged-In I9e2f8ae64e3b4693df97bb05fc850209d6eb3597 with SHA-1 34582e78 is already in history

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



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