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

Change-Id: I926583d87d19328eb3bc506a7846beaaae99fc74