Merge upstream, add packages_services_Telephony to my repo, chromium_org is not in my repo

Change-Id: I57b5d0132db85178f7a331ef7d5da57266a803ef