Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks." am: 750364bd76

Change-Id: I31b71125bc8b63a59de63d3c674167eebabd5fe7