Merge "Clamp NNAPI HAL Version to runtime version -- hal" am: b66f1308ac am: 27e3ce4cf6 am: 9c4d73c39d

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

Change-Id: I6b5669f02cf59128acb218d0baf1a2ea3cc99b39