[automerger skipped] NNAPI Combine Compatability test with VTS test am: 3247f76e35 am: 52da1b820c am: 3967ccfffa am: 17d8081fbc
am: d2a6e568f1 -s ours
am skip reason: change_id Ib93d159dc657eaf292d16140ebdd9de3b0f5f1d3 with SHA1 72227f3ef8 is in history

Change-Id: Ifeafb87512fb207438f48dab97c53c352c7addf3