Merge changes from topic "aosp-nnapi-reusable-execution-canonical" am: 43ae2ecfe4 am: 1d5c701a44

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

Change-Id: I55aa11abc58ced070bdd0399a9acae69862c754a