Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*" into tm-dev