Merge changes from topic "am-f879e94043324c8cb3351aaf2c844d35" into main

* changes:
  [automerger skipped] Merge "libstagefright: add default gralloc usage for detached surface" into android15-tests-dev am: 4f09510ed5 -s ours
  [automerger skipped] libstagefright: add default gralloc usage for detached surface am: 43f493770d -s ours