[automerger skipped] Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL...

[automerger skipped] Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."" am: be7f81f5 am: 1f711eed am: 8fc48903 am: 25dc967d am: 2d261080 -s ours

am skip reason: Merged-In Ib3b732aa406f6d37e8f941082807c9232720c909 with SHA-1 478a78ea is already in history

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

Change-Id: Ia21f726dfc2bbd2ea83f158e2871d48afb1cdc18