Merge "NNAPI HAL: Remove priority from prepareModelFromCache_1_3" am: ea14e3445e am: 7c55cbca56

Change-Id: Ib8e7d6285f3ad7fb9d46370339f05d8fd2ae1429