Merge "Revert "[rkpd_client] Add Error type to rkpd_client"" into main