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

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

Change-Id: I127f03003024426fbca741b5282a1b9d3d1eac42