Merge changes from topic "nnapi-reusable-execution-hal" am: 75decdedcc am: a32b971732

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

Change-Id: Ie990b5923afba2abfe826e61636a4d8f6d95ffb7