[automerger skipped] Fix NNAPI QoS Deadline test am: 5c40bcc4 am: a746fd03 -s ours am: ab622705 -s ours
am skip reason: Change-Id I1068fe70e74a12006dea3cdf4ae9da50004ad24b with SHA-1 c7327c57 is in history
Change-Id: Ic958b6b6b6b52b98c3ac9d59bca9151f71820f73