Merge "Use ContactContract.Phone instead of internal definition"