Merge "Update NNAPI owners file" am: 69e8cc44f4 am: 5272d38dbf

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

Change-Id: Id6e6355e01ae3f2d414997a57de93ec260a0ad5b