Revert very bad commit (strange merge problem)?

* This reverts commit 3f224e7efe1cf8a816c6de4f5dd5eaf8a5f00d1b.
* Use StructuredName.DISPLAY_NAME for Email display name on upload

Change-Id: Ic11713773d0e5b0db452dce3c9c31680ca45dbf5
1 file changed