[automerger skipped] Merge "Clarify NNAPI control flow shape constraints...

[automerger skipped] Merge "Clarify NNAPI control flow shape constraints RESTRICT AUTOMERGE" am: 348df54c am: e64f918d -s ours am: 1ebcff0d -s ours am: 5f1fa7c0 -s ours

am skip reason: Change-Id I4c2b83e11b27b791b3aa624be68474011b92a269 with SHA-1 709842ab is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1351586

Change-Id: I7aee6f3d12058febc878f624dd39f833d7de3fb7