Merge "protected android.provider.Telephony.SECRET_CODE" into oc-dev am: f968e14b68
am: a887167bad

Change-Id: Iafb22c28731943e9830c6c0932ab8d031b4f2f8f