[automerger skipped] Merge "NNAPI: Add AIDL drivers registration" am: 3fd9089a am: 6ed05105 am: 2caa105a am: 51f8ab4a -s ours

am skip reason: skip tag Change-Id I2c8c9a49ff917b243348043df1158a8d98f131ce with SHA-1 5f732ff6 is already in history

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

Change-Id: I7954a59e2b2a5ca58fd2bbb74a0235aa4e86c296