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

Change-Id: Ia14941781bb3a414c80fc4f9f9dcd291bf22617e