Merge changes from topic "nnapi_ext_restrict"
am: 8854a3d599

Change-Id: Id3e9147039ec279e0392983e8b9ecfa25cbb66b7