am 5d933430: Merge "DO NOT MERGE - Updated Contacts expanders to new style" into gingerbread

Merge commit '5d933430a1d514230cb662a0253fe81619b9a36d' into gingerbread-plus-aosp

* commit '5d933430a1d514230cb662a0253fe81619b9a36d':
  DO NOT MERGE - Updated Contacts expanders to new style