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

Merge "[automerger skipped] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync am: b373fd8f -s ours" am: 7398b0c6 -s ours am: b975bc27 -s ours am: db399ed3 -s ours am: 275de234 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1b3266d5a96dcd036ed0f08cb7f844cd036f953e