Merge "Make NNAPI Version more structured -- hal" am: 71b595549c am: a9ebf76162 am: 4d7093ecd2

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

Change-Id: I6947a930b6d6bb11086b40ec14abaea564676dbb