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 am: 505e97c9

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

Change-Id: I75065286091aa75a9f3c7691d9e0c3bd7c068a67