Merge "Support AIDL versions for TestCompliance." am: 01e51d5b13 am: 3984493564 am: 378824b52e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/1907710

Change-Id: Ifea34ea000ffba2495a20268825d8b5eb4f7c111