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

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

Change-Id: I58a2d55711c25a838bc94221e49e5981fe6632f8