Re-arrange handling of settings storage partition

Sometimes we received an error about being unable to locate
storage partition because the DataManager would attempt to access
the PartitionManager before we finished adding the storage
partitions to the vector.

Change-Id: I0ce1778938d308b1eb17de46a192ecd52489cad3
Merge remote-tracking branch 'omni/android-4.4' into android-4.4