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

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

Change-Id: Id040e6a3beb990687798ac9b1f02666e594f76e0