[automerger skipped] Merge "Add 1.2 NN HAL: IPreparedModel & callbacks." am: ba400a29db am: 674808801b
am: 9479bd15a8  -s ours

Change-Id: If2294429905710db687bedbdb508ccd2ed475203