Merge "Require mapper4" into main am: 1da295ca am: 1a72ce6f am: b5d9f448...

Merge "Require mapper4" into main am: 1da295ca am: 1a72ce6f am: b5d9f448 am: b607ed90 am: abb9754d

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



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