Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev...

Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc17503 am: 7986672c" into rvc-d1-dev-plus-aosp am: 2d2ae18c am: 31738feb

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

Change-Id: If8f4e42c16a3e0a35a35a7011c87820c55560375