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