Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4

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

Change-Id: I80f8635286a2642242819e2184844145661a4661