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

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

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