am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread

Merge commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f' into gingerbread-plus-aosp

* commit '6dd19ca5cb78008d6793d0a223a6189786c5c62f':
  Make VCardTestsBase public.