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

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

Change-Id: Id401876ff83207d034a8db3c0d872e733213585e