Merge "NNAPI Concurrent Query Management -- HAL and VTS update" into oc-mr1-dev