Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp2" am: 1191f516fe
am: e0cfca0d01

Change-Id: I1b1560b15db5921ff299bb71a7f875651643ba9f