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

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

Change-Id: Id9a4bed0547beb08fcc239d6a3f876440b5d929f