Merge "Require mapper4" into main am: 1da295ca82

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

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