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

Change-Id: I2a66287f3db25990ad76479ace0a01414e116d4e