Merge "Add presubmit tests to NNAPI -- hardware/interfaces/neuralnetworks"
am: 80ad3f8449

Change-Id: I2b9380ab5a0fe49b3d4e6f98615291ba15622672