Merge "Set correct API level for NNAPI AIDL service discovery." am: f61f789f86 am: 3d4bd3ef47 am: 1f7df75f4c

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

Change-Id: I5d0e4449f5ac109bd8590244ff8c334ad7063eee