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

Change-Id: I33dca6e35522eaac2acbe44ea6adea61f0998822