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

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

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