Merge changes from topics "executeFenced_tests", "nnapi-decouple-1.2" am: 8db59c363b am: c785386a44

Change-Id: I30f3ee90899a04d26c7e69e344f3f5fda5dd3104