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

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



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