[automerger skipped] Merge changes from topic "nnapi-timings" am: 8f583928 am: ae447b1a am: 2be17732 -s ours

am skip reason: Change-Id Icf37d05c884c740178324fcd046ea56914ef7d44 with SHA-1 11761e37 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e2dd67380d8485e4a3db69f580c0e534a7e3a74