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

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

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

Change-Id: Id4c0c34e3ad5f68b34ce551582bbbe1147f68e04