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

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

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