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

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

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

Change-Id: I80b429937112f743d96f320c28fe0d90b4701e7a