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

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

Change-Id: I82775c469227accc1080978dc780b0c3f31b68cc