Merge "Mark android.sdk.major_minor_versioning_scheme as exported" into main