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

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

Change-Id: I6dcbf453e4093bb5a7bbcf2089df48a607e5b2f8