[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f77 -s ours am: 477f4586b6 -s ours am: e69cbd7488 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062086 Change-Id: I3a5d1b0108f50a743af2c85eae35ebea8fbb0179
This commit is contained in: