Merge "Use proper coded alphabet when a contact is written into EF_ADN of USIM." into p-keystone-qcom