Merge "renaming telephony internal intents" am: e9ad5cc4e6 am: 2e76de21c0
am: 07eb989574

Change-Id: I024cc289f4325d176b01f5d4d695c1c6a45f19bb