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

Change-Id: I4b544145c59c7ba73a0187d320e01c56f9b63fe9