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: 16f43d14 am: 7c9d5876

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

Change-Id: Idc542268b8b5df2b463a27bbfbeb9d900ce2f2ed