[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f -s ours am: 896ebd20 -s ours am: 0cea7063 -s ours am: 379fbb3e -s ours am: 57cbab7e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I691a3ceeff2c1b082b9668ed36a71913c01db386