Merge "Clarify NNAPI control flow shape constraints RESTRICT AUTOMERGE"