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

Change-Id: I936ea1c7d2de2e1d9ead824f16dba60365301548