Merge "protected android.provider.Telephony.SECRET_CODE" into oc-dev