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: 04996a25" into rvc-d1-dev-plus-aosp am: f475006f

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

Change-Id: I746b92570e3e6e09812698c42b15a6fc923407d4