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

Change-Id: Ief6e2eccc0c033d35ae6b11d738023c4d106e7eb