Merge changes from topic "am-e0e139b69a4045dea9dfeb19376e3714" into main

* changes:
  [automerger skipped] Merge "Annotate GpuWorkTracepointTest with RequiresDevice" into android15-tests-dev am: 88b781fbf1 -s ours
  [automerger skipped] Annotate GpuWorkTracepointTest with RequiresDevice am: 64199fb7c7 -s ours