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

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



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