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 am: c06c8f9f" into rvc-qpr-dev-plus-aosp am: 3c9bf33e

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

Change-Id: I1d099a1f39e0ca2364051a8230c3549821d78d8b