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

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

Change-Id: I747114e8fab910efe1f935f2f63ea7dfbd569ee1