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

* commit '726e9ea7322d5122a22a0077d58ae92870962df4':
  Fix getPackageInfo("android") in the system server.