tree be476940dad3c0be2d47f3ceb007e3ff7cb5d121
parent 0a99c8b1fd70a53dccc73d48d3e53436736e3818
parent 4074cafa69b528030d81bd7c4c2cd47f842073ea
author Mady Mellor <madym@google.com> 1644359564 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644359564 +0000

[automerger skipped] Merge "DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync" into sc-v2-dev am: c8cebe93e3 -s ours am: 4074cafa69 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I610c05e9e6207ca6adfb0b52f35af89e93f1c13d