[automerger skipped] Merge changes from topic "aosp-nnapi-cf" am: 8d38d27bb9 am: f02d380818 am: f97006207b -s ours
am skip reason: Change-Id I7a75175f00fc98df626c40ea669021ccd40130e0 with SHA-1 a785a3faac is in history

Change-Id: Ie382a5da7af69e1e34a8fcfe62a307bba7e0ef71