Deduplicate adapter-of-installed-packages code.

Change-Id: I454ba79eddaaff86233a2cc341f4c8bebe94729e
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0