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: 6366521b am: 3f07c5dc

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

Change-Id: I11d2b1379304493cafd8aff765808df30e26ac6f