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

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

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