Merge "Freeze neuralnetworks AIDL version as v2 for FL6" am: 2a7b0014a7 am: d42d9f7f4b am: 80b9eaa419

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

Change-Id: Ia594e19a80c1d114022e93d0e83d57ca64bb45ba