[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 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/+/16778403

Change-Id: I35624a640327be17ce28a317e9eee5de5fc3d184