Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375 am: 4dcd6ee8ac am: 0344eb3d3e am: 92c0cd3302

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

Change-Id: Icd7cd5afde83a3c0fb0023288d7cfe4b98eb5d24