Merge "Merge "Only inflate & add if it's a bubble" into rvc-dev am: 3ef506d5...

Merge "Merge "Only inflate & add if it's a bubble" into rvc-dev am: 3ef506d5 am: 5fd277e8 am: d7b21537" into rvc-qpr-dev-plus-aosp am: 6576ce74

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

Change-Id: I6f3575b2ac0a8609b708d5af23d6944f3ade2d32