[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: 0cea70635a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I12e731ca895ca8e940ace1b86effc16fc8090be2