Merge "Ensure we do not set seInfoTargetSdkVersion to 0." into pi-dev