Merge "Open up AndroidPackage as @SystemApi"