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

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

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