Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: 9c0ada2858 am: dafdfb6ea1

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

Change-Id: I4533af8250e0ce70b949891fa8bdb5434ae1f7e1