[automerger skipped] DO NOT MERGE Disabling BubblesTest for further investigation am: 79860ced77 am: aba7973489 -s ours am: f43eb06f12 -s ours am: 04511b362f -s ours

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

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

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