Merge "GpuMemTest - switch mTestMap bpfmap init to move assignment" am: 02983cc9b8 am: 824771b88e am: 0684601024 am: c275c9724f am: 12d6aea180

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

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