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

Change-Id: I36818615544431f6457625814994244b267b1716