NNAPI Concurrent Query Management -- VTS Configuration update am: 8a588d8bf5
am: 098c651287

Change-Id: Id921f3cab72721ae62e98c114e31925ec3ad75bd