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

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

Change-Id: I1f34bce73795380ce836b0799c113c4b95e44158