[automerger skipped] Merge "Add NNAPI 1.3 OperationType" am: 2264258028 am: f604476205
am: 48df99d79f -s ours
am skip reason: change_id Ieaede9b7a6cecb16dbcc753f347f7ff04c009f20 with SHA1 8774f10b76 is in history

Change-Id: I47ccfc31b20d3833d9bffbb5920dd9f0c36f9592