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

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

Change-Id: I746f5a5121e68c2affad36fee80a865675d59067