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

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

Change-Id: Ie0822571c027360ba8bf49cd3f1f9943745ff109