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

[automerger skipped] Merge "DO NOT MERGE Fix issue with bubble stack & bubble data expanded bit being out of sync" into sc-v2-dev am: c8cebe93 -s ours am: 4074cafa -s ours

am skip reason: subject contains skip directive

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

Change-Id: I610c05e9e6207ca6adfb0b52f35af89e93f1c13d