Minor cleanup for ContactsProvider2

- Add final when applicable
- Renamed some constants for consistency
- Use @VisibleForTesting
- Other minor clean-ups

Change-Id: I4dc835c8b099334ee51f8c8e9a5e7e5629b717d5
1 file changed