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 am: 6e00f4ee

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

Change-Id: I268626aee2fee26633f77b90b41b07b56e6e3635