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

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

Change-Id: Id0bbc07d4c812eabb9696cf8c53294d3a647fc1b