Merge "Set correct API level for NNAPI AIDL service discovery." am: f61f789f86

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

Change-Id: I2b8234bf1af2917eeca047709cb382229d75d41c