Merge changes from topic "nnapi_ext_restrict" am: aef149ecde
am: 52d97c1b5a

Change-Id: Ie7b2cab7e55dacc8eba42a2d3c9eb7bf28c49c3b