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

* commit '9301eafbcc39f9cf6980f937f78886f35dec9d9f':
  Fix getPackageInfo("android") in the system server.