[automerger skipped] Add Quality of Service to NNAPI HAL am: ed8e77bf12 am: 4fb96b26ae am: a07f40932d -s ours
am skip reason: Change-Id Iaa7877bde1f463635b8bbdb4e8a001d7b79b9c65 with SHA-1 c2499ecda1 is in history

Change-Id: I24a4cff9ceb32b2a026f8ae6ac86a3fc903c2fdd