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

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



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