am 205fe71b: Extend and fix CalendarProvider2 unittests.

Merge commit '205fe71b416fe4a742310dabed5e813946afc999' into eclair-mr2-plus-aosp

* commit '205fe71b416fe4a742310dabed5e813946afc999':
  Extend and fix CalendarProvider2 unittests.