Merge changes from topics "aosp-nnapi-1.3-operations", "aosp-nnapi-async-cmdqueue" am: 1b4b30d064

Change-Id: I634a9e12c74a156745428568b3af585fb2bcf8a5