Merge "GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING" am: 939a6e8404 am: 4c2b547d7e am: 8849f4b784 am: 4fa69a3443

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

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