Merge changes from topic "nnapi-aosp-sync"
am: 07c5cfcf34

Change-Id: Ic053f5f3f8282f2ee001f82a78c45c7f1e070040