Merge "Replace Telephony's hidden API Intents with @SystemApi Intents" am: ef2d2a3dc3

Change-Id: I25fdc4c7c95a033ee2c666c23dd5591a2a903902