Merge "Introduce canonical types in NNAPI" am: f3a14c0004 Original change: https://android-review.googlesource.com/c/platform/frameworks/ml/+/1433233 Change-Id: I39fbdc2ebec01f6dd012ed04ce677fb6275f62dc