tree 09bc30bb3449546a7ff67faa30875b4ad2bc048d
parent fe3ce66c352672acb03fba9b27b1be20bd1f41bf
parent 896ebd206d2569d24aab65c285f94a41b118c510
author Mady Mellor <madym@google.com> 1646787232 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646787232 +0000

[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours am: 896ebd206d -s ours

am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c5358 is already in history

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

Change-Id: Ic7cda68a497f4934e48b74fb3425deac98a95935