Merge "Require mapper4" into main am: 1da295ca82 am: 1a72ce6fca am: b5d9f4483a

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

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