[automerger skipped] Merge "Fix...

[automerger skipped] Merge "Fix GraphicsMapperStableCTests#LockUnlockNoCPUUsage" into main am: f97f4190 am: f88cbd71 -s ours

am skip reason: Merged-In I589e7673236107b92d3d6a2587eab55f81b8520d with SHA-1 1a11f4c8 is already in history

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



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