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

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



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