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

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

Change-Id: I0536ab5c555539736678a7f5c1fa2b596d89c413