Merge "renaming telephony internal hidden intents"
am: 6d198966fe

Change-Id: If1db829fe5308bcbc1d8b778aef50368581850f4