Merge "Create conversions to/from NNAPI canonical types" am: f77f02bf50

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

Change-Id: Ic1a7e29d28a9c6ac3213a2fe95b5732206a0da85