[automerger skipped] Merge "Migrate NNAPI to canonical types" am: c21732465b am: bc55f56d18 am: d61f263d69 am: e718226fa2 -s ours

am skip reason: Change-Id Ib5282e5477e7c632485a966b2fef02044ce9fb96 with SHA-1 8230f8c6f2 is in history

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

Change-Id: I7c63d7acd7d03add51a192fc0ea50f5b50f531fa