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: 5fd277e8 am: d7b21537

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

Change-Id: I62faca09f5db6cd0d68c8022f9be9e1ab2260f6d