Merge "Enforce min_sdk_version=30" into main