Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
[automerger skipped] Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp" am: f59720c6 am: 944d14c4 am: 5dc6f376 -s ours Change-Id: I5c86899c26b2d8fb8c31948629cda87dbea0a407