Merge "Revert "Revert "Open up AndroidPackage as @SystemApi"""