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: 74a975e8 am: 06b73d9d am: 51749ea5

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

Change-Id: If48c13199a5aedb0993a5c7246c1a5771b5046b0