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

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

Change-Id: I94b642c7f2b14594bf0e37628cd22b362e562eee