Merge "Enact minimum height requirement for notifications" into tm-qpr-dev am: 0f6acd6f

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



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