Merge "Make apex_available of nn hidl interfaces explicit in Android.bp" am: fd48e195bb am: 1156f7c564 am: b0e2887437 am: 260e398b45

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

Change-Id: Id67c68d33589e22cbd2ba407a8440af54bab25cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>