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

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

Change-Id: I7f9e568a408a90cfa72ebcdfc986e5e549fea155