Merge changes from topic "cherry-pick-rkp-hal-split"

* changes:
  Add missing dependency on RKP HAL
  ID attestation: Define tag for a second IMEI