Merge changes from topic "nnapi-timings" am: 8f583928c7 am: ae447b1a84

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1512f0aee1f960e809a42448b9aafed0de3dbc2a