Merge "Move android.provider.Telephony.SECRET_CODE to Telephony.Intents." am: eb9452a08d am: 8e3dcbb5d3
am: b828fa2bfc

Change-Id: I086a958cab93dcbc47103e5d0c7d91dba5aab412