Merge "Merge "Remove BubbleEntity via IDs" into rvc-dev am: 853ee37937 am: e66ed082a4" into rvc-d1-dev-plus-aosp am: d33f341e8f

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

Change-Id: Ibb9c44fbd405f0522b0af45afb0278bb2c4f9b3d