Merge "Fix bubbles returning after a runtime restart" into rvc-dev am:...

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

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

Change-Id: I1bdbaa65e93f8adf63688cbb078544ec3c28116f