Initial Contribution
Fix issue 1164: Incorrect organization type label in contacts

http://code.google.com/p/android/issues/detail?id=1164
This patch is working with http://review.source.android.com/1845
They are in 2 different projects, so I need to commit twice.
Code drop from //branches/cupcake/...@124589
Merge commit 'remotes/korg/cupcake'
auto import from //branches/cupcake/...@125939
Merge branch 'cupcake'
auto import from //branches/cupcake/...@126645
Merge branch 'cupcake'
auto import from //branches/cupcake/...@127101
Merge branch 'cupcake'
auto import from //branches/cupcake/...@127436
Merge branch 'cupcake'
auto import from //branches/cupcake/...@130745
auto import from //branches/cupcake/...@131421
auto import from //branches/cupcake/...@132276
auto import from //branches/cupcake/...@132569
auto import from //depot/cupcake/@137055
auto import from //depot/cupcake/@132589
auto import from //depot/cupcake/@135843
auto import from //depot/cupcake/@135843