Merge "Make apex_available to com.android.neuralnetworks explicit in Android.bp"