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

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

Change-Id: I336f613666dbcb4bc7df8e7a356c946129efe7bc