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

Change-Id: Ia636cb13e60d1ed1e677925a2050a48f03568b23