Merge "Protect TelephonyManager.ACTION_SECRET_CODE"
am: 68a544d209

Change-Id: I1cf6213ec9b2762f467e1c8c828635b02e421f5e