Merge "NNAPI: Add OptionalTimeoutDuration to 1.3/types.t" am: 456d54c936

Change-Id: Id2fe1f83492a418ef32950d46c7a2b20baf2c952