Merge "Enforce min_sdk_version=29"