Merge "Add Android version check to GpuWorkTracepointTest" into udc-dev am: f442648838 am: e933fa4c1e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/22121167

Change-Id: I71c4b5c8ee8ea9115b8f847d8f5458791c84942f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>