Tolerate crashes during re-aggregation.

This CL consists of two parts:
- Don't crash even if the name_lookup table contains malformed data.  Just
treat it as name-unmatch.

- Don't crash even if an exception is thrown durign re-aggregation.
Re-aggregation is not *that* important anyway, so in that case just bump the
logic version and start the provider normally.  (And even if we fail to bump
the version number, just go ahead and continue.)

Bug 6827136
Change-Id: Ifa3d4697c5d81f3480e0b8a9238b49312ac75e3b
4 files changed