Merge PersonDataStore into AccountDataStore.

It actually ends up being a lot simpler, more flexible, and less
confusing.

Change-Id: I6cd2b6a14f44d038d1d81ac8f4722b82d86806c0