Merge "Allow rkpd mainline module to link rkp aidl bits" am: 9d52a3579e am: 00c7711bd9 am: 1b6c8d81f2

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

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