Merge changes from topic "nnapi_ext_restrict"
am: aef149ecde

Change-Id: I62a851d5feccb0c8c201c76dc1771d98068da45f