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

Change-Id: I0b45d353d159c430649033e2c4531e8153e34047