[automerger skipped] Merge "Update sync fence related API for NNAPI" am: 1eb640d440 am: f48c750c10 am: d66a7caa85 -s ours
am skip reason: Change-Id I1687ec5543f93ed9bb5d7fcf14dbe15ed5b5cd0d with SHA-1 3fd70b020e is in history

Change-Id: Ic614aa41b5cd6fcf8b706314192edc5d05ae6ff1