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

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

Change-Id: I484f05b99edbe83aeb446c4e5178ba7a20f0839c