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

Change-Id: I5a41c22761c750e55960f2d6f6c636091e646b27