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

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

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