Merge "Fix GraphicsMapperStableCTests#LockUnlockNoCPUUsage" into main am: f97f4190df

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3417147

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