Merge "NNAPI: Add AIDL drivers registration" am: 3fd9089a0a am: 6ed051055e am: 2caa105ade

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

Change-Id: Ib2f36292292b9b964740802a957ef01f34ec2394