[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data...

[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f -s ours am: 477f4586 -s ours am: e69cbd74 -s ours am: 266e4236 -s ours am: d99cca37 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iee6df5cb3fe28ce6bb64845cdf1909554fe2326d