[automerger skipped] Merge "Move NNAPI type information to types.spec" am: a23a3613 am: 00184558 am: 5c293f05 am: 22ba64d8 -s ours

am skip reason: skip tag Change-Id Ie2dbbc0fc92e52b08adc807a7f514bd8945a055f with SHA-1 14c1f985 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1642100

Change-Id: I9e7f1a4c4350dd48c19ca0283f324ee51ce8ed88