[automerger skipped] Merge "Add telephony module" am: 5a097ffef6 am: 676c129a8e -s ours am: a491cc3d0a -s ours
am skip reason: Change-Id Ic078afd377d9d7d348b73a77ee1bfe2fa4e8f620 with SHA-1 a4efed8686 is in history
Change-Id: I85e1f062e85e49afbc26f7161893d774d0db58fc
This commit is contained in: