Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp"
am: f59720c6b8

Change-Id: I636b34bce6c154c72f1eb732a23d8473b17f7efd