Fix failed enterprise unit tests in CP2

Changes:
- queryCorpContactsProvider will throw exception if
it receives non-cp2 query
- Resolved the conflicts between ag/861964 and ag/861953
so test cases will check empty cursor not null cursor
- Remove getCorpUserHandle(c) in tests as no code using it.
(Proguard will stripped out unused method in CP2 and cause test fails)

Bug: 27114665
Change-Id: I33e87ada0bc1b62174c9a0d9df8840ba3fa23a3c
5 files changed