Merge "DO NOT MERGE Disabling BubblesTest for further investigation" into udc-dev am: 9ebd5cf3f9

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

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