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

am skip reason: subject contains skip directive

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

Change-Id: I6dfa54c2cee3345e4da754ff6c38b8a28e688fed