[automerger skipped] Revert "Do not load xml metadata for unchanged packages in RegisteredServicesCache" am: c0e4ee7332 -s ours am: 27fb629b66 -s ours
am: 16c1a664e5 -s ours
am skip reason: change_id I2f78f0dbbace212309b87f779efad020cf255196 with SHA1 40431ae1bc is in history

Change-Id: If19547e7893938054e4cff601c2d3ef3ab09ab3d