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.