Merge "Merge "persist desired height of bubbles to disk" into rvc-dev am:...

Merge "Merge "persist desired height of bubbles to disk" into rvc-dev am: 16fd58a0 am: 6366521b" into rvc-d1-dev-plus-aosp am: dab789d4

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

Change-Id: I57ff53d8b589fb7b9a31bfbd05dcf73a986d00ba