[automerger skipped] Merge changes from topic "nnapi-control-flow" am: d7975bf8d5 am: c6018e2297 -s ours
am skip reason: Change-Id Ie40c248b174964676985403f9f1a5127b408a00a with SHA-1 f034bf9c92 is in history

Change-Id: Ic0f8885e9fd6ddf21b729513bf216d05c000ea8e