Revert^2 "More judicious permission-change handling"

This reverts commit 2b70fd8d.

Reason for revert: Fixing forward original bug. Original change exposed race condition that is exposed on Mokey devices where the database isn't initialized by the time SyncAdapter starts querying account data.

Change-Id: I734155b47e0407e8db8e31868a5eb3ee08203956