Merge "GpuMemTracerTest - switch mTestMap bpfmap init to move assignment" am: b69a669d59 am: b4bd6b5123 am: 4897a0c593

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

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