[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: a78dea29 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ifb13f66d3221b1e1df5e497de02f1f74f8652c1d