[automerger skipped] Merge "Add telephony e2e tests" am: fe0c6ab9de am: 438e138432 am: caf0435b8d -s ours
am skip reason: Change-Id I4e22c86a98e186268c66ce9c28f687effb425fc0 with SHA-1 a816f33410 is in history

Change-Id: I4d99b4db57ae4a512c7f0cd44f71111ceeccb6ab