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

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

Change-Id: I9b599d3af3bfd33b39210920c43385a8b87953ce