Merge change 2652

* changes:
  Move ContactsContract.java and SocialContract.java into android.providers