Merge changes from topic "aosp-nnapi-cf" am: 8d38d27bb9

Change-Id: I5afe108e5248b2012ddb4c8a36e66aaf8c792864