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

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

Change-Id: I9576bfa3083eba6a66c66ed65fb4001231d0225d