Merge change 23664 into eclair

* changes:
  Add ContactsProvider tests to runtest as 'contactsprov'