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

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

Change-Id: I5a9553f65c55839279b8f44e0805d426b0406de3