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

Merge "Add RKPD unit tests to trusty keymaster changes." am: f8b5e48e am: 81355725 am: 1faff38c

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



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