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

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

Change-Id: I6c4d795c4d63593dba7061a979e0e441dbe52931