Merge changes from topic "NNAPI v1.3-aosp"
am: b046c4eb2d

Change-Id: I860cd76fe5f0a500ecfbd349176fae660a79aa51