[automerged blank] Fixed an issue where notification launches were visually broken 2p: 34582e78 2p: 780c34e9

Blank merge reason: Change-Id I9e2f8ae64e3b4693df97bb05fc850209d6eb3597 with SHA-1 52a6b2ac is in history

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


Change-Id: I2019f2dc752edd97be2d64836c50b0b26e054d37
Merged-In: I9e2f8ae64e3b4693df97bb05fc850209d6eb3597