[automerger skipped] Merge "Revert^2 "Remove Vndk_use_version property from AIDL"" into main am: 8cdcadcbe4 -s ours am: 479d8c04df -s ours

am skip reason: Merged-In I681cc850341a7dc47416dc81c1da21b687f87b1b with SHA-1 ec3db82cd0 is already in history

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

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