[automerger skipped] Merge changes from topic "NNAPI v1.3" am: b4ff6258c9 am: ed0f3469ce am: e601f0d3e4
am: 7854cc1906 -s ours
am skip reason: change_id Ic41febe005dfefe834587ec67fdda52e112c37cb with SHA1 7259f3ab24 is in history

Change-Id: I05bc950967c1fc5378aec668b1f147025820c988