Merge "Fixes attestation id gathering from secondary android user"