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

Change-Id: I2693b8d6f79b0f5e0c0c113d36b4a7eb27d4759b