Merge "Moved SmscIdentity to SMSManager also made it SystemApi"