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: bafa895b

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

Change-Id: Ib95e1ca65d1d48dda0c629de3d49089e7127b9d5