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

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

Change-Id: Ia79a4a3189a84591d35ab2303d2e20be77a21efa