[automerger skipped] Implement NNAPI canonical interfaces am: 4b276a76 am:...

[automerger skipped] Implement NNAPI canonical interfaces am: 4b276a76 am: e91a56a7 am: b88715f9 am: ac08b8b2 -s ours

am skip reason: Change-Id Iec6ae739df196b4034ffb35ea76781fd541ffec3 with SHA-1 3670c385 is in history

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

Change-Id: I7cf7a0aee97522c7682d73546beb7232f873b5ca