Merge "Clarify NNAPI control flow shape constraints" into rvc-dev am: 36e9e40436 am: 85c92f0633

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

Change-Id: I4e99ead6d88e4fb18a44f1586af9b2890a8feff5