Merge "Fix some layout issues in notification guts" into rvc-dev am:...

Merge "Fix some layout issues in notification guts" into rvc-dev am: 426f627b am: 74a975e8 am: 6208c155 am: c2bea7dd

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

Change-Id: I840bce4f867043466886eeae2270cf1f27d8f26e