Merge "Fix bubbles returning after a runtime restart" into rvc-dev am: 2b9718bc am: 7727098a

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

Change-Id: I2b38c6621e5684d899b6b9177e6f15c53b69d5c5