Merge changes from topic "aosp-nnapi-qos" am: 27cfaa82f8 am: 1090fe7c4f

Change-Id: Ia40a6a9ff8f21cd540b252f883f056d9e0931d45