[automerger skipped] DO NOT MERGE Disabling BubblesTest for further...

[automerger skipped] DO NOT MERGE Disabling BubblesTest for further investigation am: 79860ced am: aba79734 -s ours am: f43eb06f -s ours

am skip reason: Merged-In I4040dd6292795fc1866b58d40433173abf767a56 with SHA-1 4e9ee03e is already in history

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



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