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

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

Change-Id: Ia11452d939d930cc25f30445b27f965535cdfaa3