Merge "Clamp NNAPI HAL Version to runtime version -- hal" am: b66f1308ac

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

Change-Id: Ifebccd1297cef08bdc1974eebea11bc7712a7061