[automerger skipped] Format NN AIDL HAL am: 37dcda87 am: ff362f53 am: 9da30e10 am: 85a9c330 -s ours

am skip reason: skip tag Change-Id I1a360115b82b0c222666c5d9189a220e74390654 with SHA-1 402497e0 is already in history

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

Change-Id: Ieea10b11a222918358e511d0941937de3b2f44cf