Merge changes from topics "add-imei-tag", "split-rkp-hal-v2"

* changes:
  Revert^2 "Update the RKP aidl dependency"
  Revert^2 "Update README and CHANGELOG for RKP"
  Revert^2 "Split rkp from keymint."
  ID attestation: Define tag for a second IMEI