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

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

Change-Id: I8807bc2c2652fd1c64289610616af20a86c8b1a1