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

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

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