[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 skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c53 is already in history

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

Change-Id: Ic0290b9acc8aea478d1107e6a64ae5975f4e7e3e