Merge "Move SECRET_CODE_ACTION from Telephony.Sms.Intents to TelephonyManager." am: 47c7675ae4 am: f803b12008
am: 4a278cde8c

Change-Id: Iab1ad2b03adcd7d8ce56811a7356120c069c44e6