Merge "Add RKPD unit tests to trusty keymaster changes." am: f8b5e48eee

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2475212

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