Merge "Allow rkpd mainline module to link rkp aidl bits" am: 9d52a357 am: 00c7711b

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



Change-Id: I6457283b7485b32da5e2e7811bed109b9e4d2487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>