Merge changes from topic "am-61b47cfcd198496f8c644e6318bab518" into main

* changes:
  [automerger skipped] Merge changes I482c2a73,Id81f03fa,I55264110 into android15-tests-dev am: 0826325e0e -s ours
  [automerger skipped] CCodecBufferChannel: decrease balance for discarded work as well am: 4aa3f70e45 -s ours