Merge "Add telephony e2e tests" am: fe0c6ab9de am: 438e138432

Change-Id: I61aa5bc9615fba3685cac1e92405960b6deaa6b9