Merge "Refactor Sms function of using ActivtyThread hidden API Refactor Telephony function with a server method to return current package."
am: 44ab7e55d5

Change-Id: Ied97111a5467498c015764b6165e9ffa8d382ebf