Merge "Add 1.2 NN HAL: IPreparedModel & callbacks." am: ba400a29db
am: 674808801b

Change-Id: Ib67e0a61ed2a9b1f8fb3936253ab91e8aa193663