Merge "Ensure Bubbles get removed at the end of the test" into tm-qpr-dev am: fae175b7

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



Change-Id: I1a2d5f48e3c017626a1c64d0871b672efc87b920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>