Merge "Tweak IMapper 4.0 VTS to run with AIDL IAllocator" into tm-dev am: 412f907bd3

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

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