Merge "Add Android version check to GpuWorkTracepointTest" into udc-dev