Merge "renaming telephony internal hidden intents" am: 09c663a84c
am: 979e4690ec

Change-Id: I8cce065cc9ce6a87fa0ce9753a5e9170da77da59