Merge "Mark neuralnetworks HAL as updatable-via-apex" into udc-dev-plus-aosp