Merge "Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4 am: 4675ff1d9b" into rvc-qpr-dev-plus-aosp am: 6a893fbced

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

Change-Id: Iec2056dd208214d88f81b6d3d33fc8c2f9b18acd