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

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

Change-Id: I17aca050060b0aadec256ff1b16583038211c014