[automerger skipped] Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp" am: f59720c6b8 am: 944d14c473
am: 5dc6f3763a  -s ours

Change-Id: I5c86899c26b2d8fb8c31948629cda87dbea0a407