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 am: 2621f460

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

Change-Id: I8cd689616e8407fd3026de396b5fb5f64c783d5f