am 4a51d064: am 9301eafb: Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-dev automerge: 726e9ea

* commit '4a51d06402ae59b49cf0e99d05a82f71500ffe08':
  Fix getPackageInfo("android") in the system server.