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

Change-Id: I4e37359a98fb8ecdff63b45a54f08b61e7be25ad