[automerger skipped] Merge "Refactor Sms function of using ActivtyThread hidden API Refactor Telephony function with a server method to return current package." am: 44ab7e55d5 am: 0bd33fb946 am: bbee559b53 -s ours
am skip reason: Change-Id I70e129ef9e4f94b45090ab08c2cc227257833263 with SHA-1 da2d6ec3f6 is in history

Change-Id: Ia6fd0b9d322acd541775e7e869876ab82067dc22