Merge "Add telephony e2e tests"
am: fe0c6ab9de

Change-Id: Ic7960dd9741ae2d4d42a4b77f8cb527a2619b501