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

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

Change-Id: Ic7139d15ef1c9f01cb3b27c05e1ecebec59ee75d