Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*" am: 5d4f1b70c2 am: 84ec222eb5 am: aa9f97a0e2 am: b67524d4af

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2072333

Change-Id: I676f06b655147769ae89c34d1420cb81e9e270e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>