Merge "Add test telephony apex config for e2e tests" am: b354034fc9 am: b0284dc735

Change-Id: I2f717e5eee3192c1083112b7ae64265f5e65516f