Merge changes from topic "b244522899_fix_notify_height_with_bubble" into...

Merge changes from topic "b244522899_fix_notify_height_with_bubble" into tm-qpr-dev am: 90e8476e am: 318daf20

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



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