Merge "Replace hidden_api_packages with package-info.java and @hide" into main