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

am skip reason: subject contains skip directive

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

Change-Id: I90b865e7942d1fa5cb9fc8c8e4bd6e6bf291bc1a