Merge "Reland "Have property_service create a serialized property_contexts file""
am: 432cca5c32

Change-Id: I6853876fd18d769f14c12be688457a58b8711bfd