Merge "Fix the height of NotificationContentView when there's no actions but...

Merge "Fix the height of NotificationContentView when there's no actions but bubble button" into tm-qpr-dev am: f93b7010

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



Change-Id: I9274ab5ef7f7cd9b95a775fd950dc122c5c577bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>