Merge "Fix some test-specific bubbles issues" into tm-qpr-dev am: d4c0f323 am: 0eee3402

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



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