[automerger skipped] Merge "Handle case where NN AIDL callback is null in IDevice::prepareModel*" into tm-dev am: 9265715fc7 am: a29f5cc5de -s ours am: eee6708eca -s ours am: a0d49de3e6 -s ours

am skip reason: Merged-In I4a15d02c4879a0261ec26cc0e7a47d0a4da86b8b with SHA-1 d6f6d01499 is already in history

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

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