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

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

Change-Id: I62c0f455c9d728290cc4e24633576411799cb521