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

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

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

Change-Id: I96a2ef2644028c38c21bcb9542015702fa7efdf7