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

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

Change-Id: I2507e273c3c7a63e5da9208b405b79de8414e872