Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev