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

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

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