Merge "Fix OverlayConfigTest minSdkVersion" into sc-dev