Merge "Persists bubbles to disk (part 2)" into rvc-dev am: d0166e437e am: 503c28e44e

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

Change-Id: If73ae3693c55ff6611e1af726277def81f85b15d