Merge "Protect TelephonyManager.ACTION_SECRET_CODE" am: 68a544d209
am: a0c65b0651

Change-Id: I193d79249991c8d946624110dfded9bcb1b5b195