Merge "Add support for telephony tests in testing script" am: 0647b0b1fa am: 72bb5f7ec6
am: bfc142dba0

Change-Id: Ie26d4647d338c4f1da22ccb5ba368967af4f2757