Merge "Stabilize bubble tests" into udc-qpr-dev am: 8d7ade85 am: da3f53e4

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



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