Merge changes from topic "am-7c02737381864b1593fe4f753f66edff" into main

* changes:
  [automerger skipped] Merge "Add default maxBufferCount in GraphicBufferProducer" into android15-tests-dev am: e2c594e508 -s ours
  [automerger skipped] Add default maxBufferCount in GraphicBufferProducer am: 625eb01784 -s ours