Merge "Add rkpd system service mainline module to build" am: 922a22fb am: 4f4c9dbf

Original change: https://android-review.googlesource.com/c/platform/build/+/2263923



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