Merge "Mark neuralnetworks HAL as updatable-via-apex" into aosp-main-future