[automerger skipped] Change NNAPI MetaModel to use canonical types am: 0cbf566c59 am: f1c3c0edfc am: 659ccc0683 -s ours

am skip reason: Change-Id I90e83aa269528f825ebe60fddba50fef340febde with SHA-1 d9185d737b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/1544485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb82593f8936d09ccc29d8d18d7d516508af9990