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 am: b7a58d4b

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

Change-Id: I8e1edabc2964c318ed0e99877dd7fd15b59037af