Merge branch 'oc-mr1-nn-dev' of persistent-https://googleplex-android.git.corp.google.com/platform/vendor/google/libraries/neuralnetworks/hvxservice into merge

Change-Id: Ifbc866f993a1ab565387d9ffdfb2f687ce7f5d12