Merge "Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc17503 am: 7986672c am: c06c8f9f" into rvc-qpr-dev-plus-aosp