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

[automerger skipped] DO NOT MERGE Disabling BubblesTest for further investigation am: 79860ced am: d31f1d4e -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: I8dce9f8c144d16238f115ef764b52be968beb78a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>