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

Merge "Merge "Fix bubbles returning after a runtime restart" into rvc-dev am: 2b9718bc am: 7727098a am: 2e8b1b96" into rvc-qpr-dev-plus-aosp am: 347d727e

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

Change-Id: I317c863006c9269dba43ddf525646e239e2e8937