Merge changes from topic "mm-bubble-updates" into tm-qpr-dev am: 7e347d7e am: a6e73838

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



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