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

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

Change-Id: Ia2eedafd0c367d9e60b1357c7d320a98cf19a5d1