[automerge] DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync 2p: 8f368c5358

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


Change-Id: I7ac883b6c1dee96da7e42ec228a9549e15dd208c
Merged-In: I748fdd49626acaa0e986a9d8038039cada6faa60