Merge changes from topic "am-a6159419ca3c491faa5a91d61fe283a5" into main

* changes:
  [automerger skipped] Merge "CCodecBufferChannel: process surface callback asynchronously" into android15-tests-dev am: 0b49e47aba -s ours
  [automerger skipped] CCodecBufferChannel: process surface callback asynchronously am: e2f27e3d34 -s ours