Merge "renaming telephony internal intents"
am: e9ad5cc4e6

Change-Id: I7dd4f2cce8e0018f2640da361eb839a76f56af91