Merge "Frameworks/base: Refactor package manager" am: 453a77c am: 46fd870  -s ours
am: 7c9bdc8

* commit '7c9bdc8b97d6c211547c0a0cbcacff9ce58d0b36':
  Frameworks/base: Refactor package manager

Change-Id: I36c15dec392113b75385a718ec3b4e113a34323c