[automerger skipped] Merge changes from topics "aosp-nnapi-1.3-operations", "aosp-nnapi-async-cmdqueue" am: 1b4b30d064 am: 518b2d8fef am: e7c83782ca -s ours
am skip reason: Change-Id Idc3f815040efccbbfa95b70d5d437441d0bd8682 with SHA-1 33173a3e68 is in history

Change-Id: Ic6acdb91990d741e9a354cf9ad6c7c6cc249275b