Merge "Tweak IMapper 4.0 VTS to run with AIDL IAllocator" into tm-dev am: 412f907bd3 am: 0971537d4e am: 6820e450c6 am: 9d08681bcb

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

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