Merge changes from topic "revert-20364235-split-rkp-aidl-UDIJDKGXDE"

* changes:
  Revert "Split rkp from keymint."
  Revert "Update README and CHANGELOG for RKP"
  Revert "Update the RKP aidl dependency"