Merge "Introduce versions to XML for bubbles persistence" into rvc-dev am: 7cc1750375

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

Change-Id: I3f6ace34a26ad554161e746cdbf3a775a2287420