Merge changes from topic "presubmit-am-6baeef138d0f4ff29bbaa3141165ea4e" into sc-v2-dev-plus-aosp

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