Merge changes from topic "am-c02fc5d1435f465c9368d633d00379c4" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in stealReceiveChannel" into sc-v2-dev am: 8762075b -s ours am: a3be2805 -s ours am: c8c2c257 -s ours am: 60fdcabb -s ours
  [automerger skipped] RESTRICT AUTOMERGE SurfaceFlinger: fix a potential race condition in stealReceiveChannel am: 97a31706 -s ours am: 8a4f12a2 -s ours am: 44a3f3ba -s ours am: 195fc3c9 -s ours