If there's a contacts DB change while the dialpad is open, reload the
cache instead of dropping it.

Fixes issue #6679.

Change-Id: I55dc6653a175db5268bd868ee5b7dc6d75a1f1d4
Merge remote-tracking branch 'upstream/jellybean' into jellybean